Merged.
authoremellor@ewan <emellor@ewan>
Thu, 6 Oct 2005 10:12:55 +0000 (11:12 +0100)
committeremellor@ewan <emellor@ewan>
Thu, 6 Oct 2005 10:12:55 +0000 (11:12 +0100)

Trivial merge